Merge changes Iae3d6f9d,I79e25d27 into pi-dev am: da74fce85a
am: 6fddec7de7

Change-Id: I1e076640ba2d4d3cc4559b8e710750d5f8c9506d