Merge changes from topic "lshal_lazy_hals"
am: e3a52f01e4

Change-Id: I8261b7395f92c780efa487d2e015b62c72750a5a