Merge changes from topic "lshal_pretty" am: 303322f06a
am: e1111eb11d

Change-Id: I8a053e2ad9c41fa5583cfcfcf4a2c6f8a686eb0d