Merge "Revert "Revert "Fixed installation time regression when compile.""" am: 16d59b2b0f
am: 29a15f2718

Change-Id: I783b7b318fa2261d051c903274be3191e850f1de