[automerger skipped] Merge "Generate product build props always" into rvc-dev...
[automerger skipped] Merge "Generate product build props always" into rvc-dev am: 0e5c584b -s ours
am skip reason: Change-Id Ia88c8efecb18db9c27baa466e492bfd898b581d3 with SHA-1 1e6b3e78 is in history
Change-Id: I92391877330262e0e839dfe3873ef5d98238a252