Merge changes I24640ffb,I5c0ede96 into pi-dev
am: 29d1cc0fe6

Change-Id: I473ef5214abcccbbc28e8c11f809e2cb7c12003e