Merge changes I3ffb6e97,I689df136,Ia67a8eb6 into pi-dev am: ad121b9fdc
am: d00233c049

Change-Id: Iafb42e2ba343693812ab45edb2a396f36ae5937b