Merge changes I6618561d,If9479cd9,I3e13894e into pi-dev am: 858e30b7d7
am: 1062e857a3

Change-Id: Ic1f681637eba6de2ca10167ca31a6b88ebdc1182