Fix: Ensure the platform switch accomodates RHEL proper

Change-Id: I003292065049e0f628187586b39e2c5d11cacfc3
Merge "Fix: Ensure the platform switch accomodates RHEL proper"