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

Change-Id: I6b24aad867e82665476ec9e6f039b233fcf814c4