Merge "init: support wait timeout with more precision" into rvc-dev am: 7a6a01a09f

Change-Id: I832fd1d6183ba91e79d2407c2f08cbaf24be7df1