Merge 46daac3cfa6baa7d2d0446dbfae6d03012aa987f on remote branch

Change-Id: Ic6a560ed8f8eb477cec1cd845d2cddf0f1f6d77f
tree: f06be8475e67098d027aec111cb0ce273100ef72
  1. src/
  2. LICENSE
  3. METADATA
  4. MODULE_LICENSE_APACHE2
  5. OWNERS