Merge changes from topic "boottime" am: 2a53c0c16e

Change-Id: I14d9ab3e3867640d5b13ad1749f3889dd3c86968