Merge changes from topic 'lshal' am: c9bc03729b am: d99d31d5d3 am: 5581e229a6
am: cd98373272

Change-Id: Ibea02dc9a1fc6e659992c746db3ef59ec5fc35aa