[automerger skipped] Add product partition file support am: 9feca325c6 -s ours am: 3cdb8d085f -s ours am: 1b07b20d66 -s ours am: 7fb0500d55 -s ours am: 91f1676963 -s ours

am skip reason: Change-Id I2e86176285b888a923cb44278767af9f16710635 with SHA-1 8e95629656 is in history

Change-Id: Ic8b63e3c296a342865ead0b3d7e3289f66197299