Merge changes from topic "apply-aosp-1209307-and-following"
am: 9b7d89970a

Change-Id: I5c8fb6ee0b7121690d76bbc70d373529d5df639a