[automerger skipped] Allow multiple DEVICE_MATRIX_FILE am: b47671be98 am: 127b7f9249 -s ours
am: bf740d6504 -s ours
am skip reason: change_id Idb8e7eff81720bbd3705597d532f6a8306214db2 with SHA1 f2211cd3bc is in history

Change-Id: If26d8239a4060fb456c5cebd3b1005eef6ae18fb