Taken from bug 42117 which I'm de-prioritising
Version: unspecified Severity: critical
Change-Id: I3fe29c52b743837c2e1d66f25ccdca6115b8bd25