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

Change-Id: If1af507b579945333ae1d8e1769c5e25c5225d4a