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

Change-Id: Ie2196e4833b94d39d6c67b45ccb7d59d13e97c13