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

Change-Id: Ic7b69eb9075519ce964789c86f9960ddbc292902