Merge "Add missing NOTICE file." am: fcc074772f am: 0b43b07a04
am: d0e1c14526

Change-Id: I431c3657181939270ed1e1fd173b268eb373888a