Merge changes Ic1a5d032,I271e7f4d,I7af37281 am: bd34fd3c83 am: 22785b5231 am: 0eb6025602

Change-Id: Ic56ae1463dc4229e01f60d2c9afcbb7f6337a97d