[automerger skipped] Merge "Use pixel format from buffer to determine opacity." am: f667bfa451 am: e3eb4df3e9 -s ours am: a9c5d264f4 -s ours am: 84daa6c601 -s ours am: ee44b6171e -s ours

am skip reason: Change-Id I4295b837369b8ca8918d8398a29cab133a47cbf7 with SHA-1 debadb8a59 is in history

Change-Id: I9bfe41397c7624e81ec96954b4614fdea9213d27