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

Change-Id: I8c54567d7eacf4bb71f7a845b03c6316c1f317bc