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

Change-Id: I7a238b6047028819d9af1f4e50cf4f49e9617e78