Merge "Revert "Fixed installation time regression when compile."" am: bc1c6b6da9 am: 7c371c579c
am: f04cf1afd0

Change-Id: I58629a825e02d1dec34144f42547720b1c2d6b1a