Merge "Readability fix: if statement assignments"
am: 09d05a82b3

Change-Id: Ieb10c920305e557c17d42752f2eed23734ccbd9d