Merge changes Ic8d22016,I3e15296e,Ie275e22c
am: 321a60f156

Change-Id: If1c8f5dfebd3cf46178b87095df29c6b942f19ca