Merge "Fix DPMS.findAdmin() after app enumeration restrictions" into rvc-dev am: cf5670aa am: d784875f am: 5d51b9b4 Change-Id: Icd1b457877b8769920ad186a62bab08447917083