[automerger skipped] Merge "Get user consent first before checking profile...
[automerger skipped] Merge "Get user consent first before checking profile metadata." am: b0136b8e
am: 34aaaec6 -s ours
am skip reason: change_id Id07ea6e3a93cc55dc56ba10aa62b23d784668275 with SHA1 9cf29314 is in history
Change-Id: Ideab300b5b333373dedaf57ccd8ceae109e992c9