Merge "Add METADATA to emma: Apache2=NOTICE" am: 5ba3fe719b am: 6e14649fb4 am: 5962900c17 am: e2df795367

Change-Id: I738df390621784feb7edd63eb09d2d40bb039b71