Merge changes Ibcb21966,I026b9e89
am: 1e6d32cd3a

Change-Id: I47e78cde67529f6e1192cb28c29122af66485684