Merge changes I1539580e,I8452e799 into pi-dev
am: 8ea760c815

Change-Id: I4273e08bb50ba9b509171ea65d32bb6757a4a2b7