Android Studio 2.0
Merge "Expand errors that can be returned from RPCs" into studio-master-dev