It's better, the majority of these changes look more readable to me. also found some docstrings that had formatting / quoting issues. Cross-implemented with master Change-Id: I582a45fde3a5648b2f36bab96bad56881321899b
Change-Id: I3b208674649e41bca0285d00aa11cc5975eb971a (cherry picked from commit e7875b39f8)
e7875b39f8