[automerger skipped] Merge "Distinguish between uninitialized and unsupported"...
[automerger skipped] Merge "Distinguish between uninitialized and unsupported" am: 6648dc59 am: e383f306
am: c6de3214 -s ours
am skip reason: change_id Ifb7b932a31c976a6b11e97a16494c043571f3540 with SHA1 0aa98389 is in history
Change-Id: I64849b87c1a9998ca41e864cabb2f3f54d9ea38b