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

Change-Id: I2e1721b4dd5ea7eed04cf38d64219d9f8ed8cc30