Merge changes Ie3a173b7,I2afbd7d9,Id6121d88 am: 2e3e5ff3f2
am: 33add58a9b

Change-Id: If006938e2d8627404ab086a4d963b5508f5bde43