Merge changes from topic "lshal_pretty" am: 7971ad7fd7 am: 54b6e675b5
am: 47f87262d6

Change-Id: I82a365d61e283cd13c0f9e540b927f8917a6d798