Merge changes I5851dd16,Id196307f into pi-dev am: 8d6571aeed
am: bcbe8d1999

Change-Id: Ic39f37084708a70d98a887762175160204706120