Merge "Remove unreachable condition"
am: a281389bf4

Change-Id: I99e38d37f5fae3a71787eb6c63826c5fc57ba653