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

Change-Id: I0414e491d58bd82d27db87c7bc70e4a385941759