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

Change-Id: I11a78b12e3b20dadb48dc0703e8ac26ba1074867