Merge changes from topic "b127336441"
am: 9b07b1ab41

Change-Id: I104b6cda22b6d1fc0de531c54cf895d254d4daa5