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

Change-Id: I4f3e072050bc26cc4031fddcd66d919df1255ad3