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

Change-Id: I781c599a26e9c721198cf2ec112d13dbc9a42794