Merge changes Id150f78d,Iec948124 into pi-dev am: 505dbf0fcc
am: b755c8d848

Change-Id: If872b2b477be001034d1a9a175ecdc5515629720