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

Change-Id: I7a9ea24d6e86c3b771ba98e9219aa40625f920ad