Merge changes Ifd690cda,I7bcbe947 am: ec956e8866
am: ceb1ac35e4

Change-Id: If85f1c76ea8b82376d2871be41228498806a5fe2