Merge changes I848ba9b1,I03a75b45 into pi-dev
am: 2c88f670aa

Change-Id: I5130e2f5e731b885f432de6d61253449d938c9ce