Merge changes from topic "lshal_pretty"
am: 7971ad7fd7

Change-Id: I77bbe967eb911d687013c6e202d44546fd0f4e5a