Merge "Merge "Added missing licensing information in source files." into nyc-dev am: b94abc7c9c am: 147f009526" into nyc-mr1-dev-plus-aosp