Merge changes from topic 'lshal' am: c9bc03729b
am: d99d31d5d3

Change-Id: I615d885788739a2d3d2f11204ad23833a77d96d5