Merge changes Ia1b282bd,I3c53a5d1 am: 7d101a8593
am: 21a03e4292

Change-Id: I16c7675276aab404c21fc2c4b053bd172e056eb6