Merge "Remove unreachable condition"
am: f140201ff1

Change-Id: Ie7918fff22a37ea72ab59f5573790b2ed977aaee