Merge "Prefactoring: rewrite section detection smoke tests"
am: 9db1338901

Change-Id: I1503f57128b92511449cef951349d7dca5ec0094