Merge "Prefactoring: rewrite section detection smoke tests" am: 9db1338901 am: 4476ef2f16
am: 45c1add390

Change-Id: Ia7dcae9216cd2b2dfcdbae639a9710c7656dcff7