Merge "Add check for empty RDS_PS." into pi-dev
am: 9e440933db

Change-Id: Ib19c0fd49e7ffa0b6bddb01c8769423caebbfb57