Merge "Go to root from child directory when root tapped. Bug: 27060001" into...
Merge "Go to root from child directory when root tapped. Bug: 27060001" into nyc-dev am: 3b5a29cb
am: 2bc4ba4e
* commit '2bc4ba4e':
Go to root from child directory when root tapped. Bug: 27060001