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

Change-Id: Iecc90e1c2ddbc8e41233c7ced6ced33d3289e891