Merge "towards MR2: update to new backend" into rvc-dev am: 19f6945f56

Change-Id: Id2d628fecb6bdcb83c88d771977cefe044164b0c