This reverts commit 0a4e11480b.
The reason of the revert is to check for the application start time
regression that may have been caused by the CL (original CL# 2087376)
Bug: 38317397
Test: None
Change-Id: I4f249ba722791c7238a38e845a5cc2bd2d14a450
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>