Merge "Log sync enable/disable too" into pi-dev
am: 04ce26d840

Change-Id: I603d461cf83ff33d4ab6f74ee6d68e0795130fcf