Merge changes I63f2b185,I0d749c1a into pi-dev
am: 724990d5ff

Change-Id: I446ae2f2247e6a0c9dca0e660e0cb6d667fab477