tree 6641e346ffdbbc892dcb3e952b83eff3e7fdeeef
parent d726ff988c62b7d8b1e73a5512e3a82442b4f2fc
parent faded53018a3407e49f94529564eb5f77c6821a1
author Phil Weaver <pweaver@google.com> 1500413231 +0000
committer android-build-merger <android-build-merger@google.com> 1500413231 +0000

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c  -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 am: 79c476704f
am: faded53018

Change-Id: I2ba2b1380a91ee398ae65baa8b112bf9c3c3768c