Merge changes from topic 'boot-control-hal' am: f50aa9464f am: dd00e4af5f
am: d3bcc4293a

Change-Id: I0676674e877ff0f43b67c2f6e0f3f28038df09a9