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

Change-Id: I80483a19c2d11010a851b96848adba66dc65a781