Merge "Update to gradle nightly 3.5-20170221000043"