6b7e47822b
Removes unnecessary if blocks that make logic hard to read. Change-Id: Ibffee34e26aace3008047a86077cf665f2844f64 Closes-Bug: #1423235