Merge "CDD: Add requirement for Remove Location Modes." into pi-dev