Merge "Remove lock from ClassExt installation procedure." am: 878d1889 am: e1ab24d1 am: 47db8cb2 am: f272023e Change-Id: Idfca551adcd0c2e10ce1e6bcbbe299d3ad3a0e8e