am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"

* commit 'b624b3aa455ecf71c44bde4cf7488e7c199a0b8a':