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

Change-Id: Ic9dad975ec0640d1a2eda350d9adba6f6c59c2dc