Test: None (tests will be made on the Android Studio Tools project) Change-Id: I8e0ba8634500df7a8d19e0b381f46c3cd4652f5b
78929f3ee0
6a8f0d70b0