merge reboot after / before from mr1 DO NOT MERGE

- INJECT_EVENTS permission failures happens in mr0 as well

Change-Id: Id1ca13d8af9e4b9954c8b601f01c2be211a07a02
1 file changed