[automerger skipped] Add product partition file support am: 9feca325c6 -s ours am: 3cdb8d085f -s ours am: 1b07b20d66 -s ours am: 6b398d7f47 -s ours am: e2da9b89cb -s ours

am skip reason: Change-Id I201ac6c73a3658b38ae3790d9a90c9805f656ad5 with SHA-1 9feca325c6 is in history

Change-Id: Ie53fef74b50aac79ca8f7296fb8b7a8cf0ad8d53