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

Change-Id: Iae70ed275d5f1c0cab2b5626284079c8a08c9ac4