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

Change-Id: Iaa195e71789d7f46a7b272fa5fcc6c2c9be2d4df