[automerger skipped] Merge changes from topic "boottime" am: 2a53c0c16e am: 50d194fa7f am: 42ccd07772 -s ours
am skip reason: Change-Id I5ea25cba29ab8b4de630308eaba2b5d6f30a29b7 with SHA-1 a5a696a774 is in history

Change-Id: Ia26e1a9f61f7153e331bc90ca62c6622b4ab4598