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

Change-Id: If7b1316d68efd1ab191a0ebe82d178346943f987