Merge "Include NOTICE from /product and /product_services" am: 17115bdb02
am: ccbda28785

Change-Id: I9a808e76f8d5432f98dc0b2ad34fc05367c0a936