Merge changes from topic "pi_matrix" into pi-dev
am: 3569b0273f

Change-Id: I6c82b5536b11f458b28044cbe8c3ca469f3d88bf