Merge "Fixed failing SectionManagerTests" into rvc-dev am: 3c94735861 am: 3245b620b0 am: 407b7c63ff

Change-Id: Iba0d06bc28cf363f7335cbbd5103914ebd95d860