Merge "Fixed installation time regression when compile." am: 85adf5a9ac am: 5c67642150 am: 1c2d22cd89
am: 6a77a0714c

Change-Id: I11e65a08be54caca2ac7296e8e28f11e083c845c