Merge "Add license type: BSD+Apache3+MIT+Boost = NOTICE" am: 6c84a6201a

Change-Id: Ie1ec3ac33d29601842b065e3ec7ed0469376441b