Merge "CDD: Update the condition to enter S3/S4 power saving modes" into pi-dev
am: d1173fd969

Change-Id: I11d4713bdbca3f4eeb39eb70d6b1b9e1379dec4c