Merge "init: add log to time spent in waiting for file" am: 7f16cad877 am: 78f06df7b1 am: 9d4dc02f95 am: 9478eaa5a0
am: 6c827ffb4f

Change-Id: I73e4d211dcb5c4f5627d18a1a0489c294e694590