Merge "Prevent unnecessary updateRequestedState" into rvc-dev am: d8bb9b4dd8

Change-Id: I4da77c38b1b0c70c3a47058a7e134e7feebf2ff6