Merge "Gradle build fix for "Move ratings to a seperate dir"" am: 1633d47090 am: 6c382ea76f

Change-Id: I2db1ba8154f4549293650a86c91924ed69556466