Merge "Mark some tests as requiring root." am: b245609059 am: f9b9bc7e61
am: 409f35bca4

Change-Id: I0a50837a48ff814f3baf81fba1d58ad64986de19