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

Change-Id: I49cb34eebb6bb7e8ebb80f3e2edf45f36e7a2f97