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

Change-Id: Id9d5db03edbd9c53512d385c7c03f3d5eb0081dc