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

Change-Id: I2b7586de3e0a36cd09116b622dc352db9c2126e0