Merge "Remove unreachable condition" am: a281389bf4
am: 061759246c

Change-Id: Icbdf441bc974fe97c73343ff1d92e3f0d6fabaaa