Merge "Add product section for product interface enforcement" am: 9a3e85c31f am: c1765189e9

Change-Id: I217376ea52b7a5883aeff1ea9608b38994a8d804