Merge "Remove Exception in getRegisteredExperimentIds" into rvc-dev am: f3364db2d1 am: 5669954cb1

Change-Id: Iedf413e54f504855993936103ad837324f81cfd3