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

Change-Id: I50cd276b9aa67ba3aaf29ca7cd69214d23eb0ce0