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

Change-Id: I5117a3aa59f49cf449e828f1f4913b05e5ba9a97