Merge changes Ia3bba21c,I0ffc159b
am: 83d9b680f5

Change-Id: I3dc5a30f40b3066f08bbefc43fca2066967a619f