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

Change-Id: Iba47449f44e8ad4ef17f8b4c5bfb1b713e12a7da