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