Merge "Reset last activated time after auto mode changed" into oc-dr1-dev am: 13cfb46e41
am: 93bd71f10a

Change-Id: I4e6dbdf32f99dcd6eea90aed9c36aee3240e3404