Merge changes from topic 'update-verified-priority-bump' into oc-dev
am: 5f12c799a5  -s ours

Change-Id: I87158327dc482a0063c3f20a5e6f68287f2e87b0