Merge "Base: Fix dangling-else in CHECK_STROP"