[automerger skipped] Add product partition file support am: 9feca325c6 -s ours

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

Change-Id: I215bc849465590d9dbc2f3d783f62853dab5eeb3