Merge "Merge "Throw an exception if the given root alias is unknown" into...
Merge "Merge "Throw an exception if the given root alias is unknown" into pi-dev am: 49eb4c1f" into pi-dev-plus-aosp
am: 4db0bb58
Change-Id: I559fdbc3e29c3281146317987447f2be5bd02d7d