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

Change-Id: I66e83612faf7a5a74bc7c11d1ac2f325d4ca1de9