Merge changes from topic "lshal_lazy_hals" am: e3a52f01e4 am: 7ed23273c2
am: 47c652bcd9

Change-Id: I8c4c49292dd0c214f3013cf820d5809b0228f6f2