Merge changes I7c48a326,I7395ecd4 into pi-dev
am: 4e4b6ff508

Change-Id: I90fddaaf9a2fd3027d689bf356d2929c93323d5e