Merge changes from topic "lshal_pretty"
am: 303322f06a

Change-Id: Id11633ecd807d5318593fcd94173b11b0880475e