Merge changes Id150f78d,Iec948124 into pi-dev
am: 505dbf0fcc

Change-Id: I83f85dd11abac4f8e03825a2db6480c1c0e73c5f