Merge changes I3a35ed86,I74a9c767 into pi-dev
am: 02db955ed8

Change-Id: I206953b1112aec235f08107488159dcdbc3453e9