Merge changes Ibf9e7b9e,I8031590c
am: 1eb700a545

Change-Id: I3bff20ab08a33f1607ec7b91abab2a77d7a3b22f