Initial import from upstream-master

Bug: 157630845
Test: treehugger
Change-Id: I880feead283d6db9b960e9a828f339b1723e6d0a