prepared for next development iteration
format some lines.
(cherry picked from commit 7338831)
format some lines of build.gradle file
(cherry picked from commit 77dc9c4)