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

Change-Id: I8cb93c5738880509ef9c44bffcb934e7d43b6ce4