Cherry-pick of ag/853807 Tested with: Android Studio 2.0 preview Android Studio 1.5 Intellij 15 Change-Id: Ibc617cd0e5ac7b535158d5c8919c6c59441199a4
Cherry-pick of ag/853807 Tested with: Android Studio 2.0 preview Android Studio 1.5 Intellij 15 Change-Id: Ibc617cd0e5ac7b535158d5c8919c6c59441199a4