Merge \\\"Simplify code paths computation, allow adb root to dump\\\" into nyc-dev am: 1c4da6654f am: 29cd5b839b
am: 507c5001ad

Change-Id: Ib50d6a71a6afbaa546398302859c365e86ffecf9