Merge changes I35eddd24,Ia2c7093a into pi-dev am: 716f9d420a
am: 1c69f16c77

Change-Id: I5bc8af3b6ee69787557e605c13fa79179ec3e104