Perform reverify with shared mutator-lock. am: c2d0c9627b am: d1876b6717
am: e208262e0c

Change-Id: Ie621c8cc98da84887f1798e20777714a5650dde2