Merge "init: support wait timeout with more precision" am: fba5028d56

Change-Id: If84d2ba22b5b8b14fbaeeb53903f572235a177be