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

Change-Id: I30fabb967f245b8efebbd939877df62ebd8d3f6a