Merge changes from topic "rotation_config_update_fixes" into pi-dev
am: e81a27f4aa

Change-Id: I0cdb6e265d5b8c690e4115d39a86344b81dd956f