Merge "Fix omission in NOTICE file." into gingerbread