Merge "Handle the WatchRotation failed" into rvc-dev am: 8fdb8d4f34

Change-Id: I55780ee6080a93588187f6cb8258330c8c20dc68