Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into upstream-mas

Fix METADATA and get in sync with upstream.

Bug: http://b/179636234
Test: treehugger
Change-Id: I832ef9ca92e0a577aeea69cb93a0d10969198b27