Merge changes from topic "boottime" am: 2a53c0c16e am: 50d194fa7f

Change-Id: I1beb6ff7229298bf4d79a46dde715ba8912f2c27