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

Change-Id: Ia46c382a077eb5c26744cb0888a8f185f3a220a1