Merge "Base: Fix dangling-else in CHECK_STROP" am: ad81a1d94a am: 8c42c0ba1d am: 3a6f55bb76
am: 4650bbdf7c

Change-Id: Id5aa1bda0ffcfcaf5cd6a7db5729510ba3776a87