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

Change-Id: Ia4e676f1aeef4509618813562190c6562aae5e54