am ee93a310: (-s ours) am 3027a6be: am 2c5db1ea: am bbff462f: Gradle 2.2.1 DO NOT MERGE

* commit 'ee93a3107b642b0948bf8e752b5f5c9b35809ec6':