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

Change-Id: I824ab1d5c684badc91a3c787fea3d279a98699ae