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

Change-Id: I128f025cd79fc81cb4c475e6d7b635fdd8241164