Merge "Fixed installation time regression when compile." am: 85adf5a9ac
am: 5c67642150

Change-Id: I12993f2bcdf486fb0b6d52878165c293e0cd5505