Merge changes from topic "lshal_pretty" am: 303322f06a am: e1111eb11d am: 655da33570
am: 424b40487a

Change-Id: Ic64ba89bde54489955c1cd5a97ea8440c2edaef3