am c47735a7: Merge commit \'3c8eb96c\' into studio-master-dev automerge: 0c8d06aa * commit 'c47735a7': Use Lombok 0.2.3 for ADT plugin