Merge "build: Add extra build customization for /product" am: a80f1e3257 am: 64ea350dd8
am: 8e712959cf

* commit '8e712959cf8a8b9b454d1e50f960eef9d97cfbc9':
  build: Add extra build customization for /product