[automerger skipped] Merge "Include NOTICE from /product and /product_services" am: 17115bdb02 am: ccbda28785
am: b613c39cbe  -s ours

Change-Id: Iae6b1beecfe1211012960cf91187cbac12e3c6a9