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

Change-Id: I3eaadee46dfbe4e77be9536f3546832fcaa18b5c