Merge "Add license type: BSD+Apache2+MIT are NOTICE" am: a8085d20b4 am: 581e666e25

Change-Id: I5420c056102e26ce0207426e122b154e1b0827b2