Merge changes Ia1c401b8,I571fb7da,I47999569 am: c2cdaf1840
am: 511e05f893

Change-Id: I49243694410bc3136a918db842e04e3ba6554718