Merge "Fix for Idle Mode Constraint test" into marshmallow-cts-dev