Merge "Fix log message enable -> disable" am: 9cfe96f811
am: c37af25456

Change-Id: I9568205fc024f7d0970eeb2e4d10585e6963ff19