Merge changes Ib8e1b852,I7e848e97,I7d620721
am: 66098afb42

Change-Id: I446e8590dc1871bbfc458e9538130dfc79810d50