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

Change-Id: I8356411ad8c8dd643056de7af46f7cbe8cc86052