Merge changes Ie672d371,I73d130bd
am: 31586c7946

Change-Id: I27c82e9bfd469e590e05f6cc2b22c070600dc547