Merge changes I2b89dce1,I5412eae0,I2e428ec1 into pi-dev am: 990cc3e31d
am: d828b8f5f5

Change-Id: I5f8173f6cb7505355d4d89f554d0e6389e1ed384