Finish adding OTA and Notices

Change-Id: I959d89089ca598f206b890c8d08c3f7aedbe086b