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

Change-Id: I58de42644077fc31ae6f2ff7200ec78af1798a25