a65cae9e7f
(Cherrypick to AOSP master, resolving merge conflicts.) Bug: http://b/129068177 Test: treehugger Change-Id: Ib46761d89772d3a3c655a39df573fd305c117d19 Merged-In: Ib46761d89772d3a3c655a39df573fd305c117d19