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

Change-Id: I93939850b01fbb323178f7e17d3f98123aa6fd04