Restore some aosp/master changes lost in cherry-pick 7c438b19b71932ac8a44eff44f20744a01559c8d

Change-Id: Ic9fe8a235baac85efbdf748aeaddf98139558c4e
2 files changed