Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev