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

Change-Id: I526b604879c5c5103a7d0f9a66471534383c6175