[automerger skipped] Merge "Y16 format enablement for external provider" am:...
[automerger skipped] Merge "Y16 format enablement for external provider" am: 44968dc6 am: 0e8d2cb6
am: e0768654 -s ours
am skip reason: change_id I358686e7c4330bb180dec4a9cce3bc1cf5475260 with SHA1 eed0040e is in history
Change-Id: I4a4e4131abd1e0297beb87099fc6bd464e61452e