Merge "Fix CTS" into rvc-dev am: cf8ab8447e am: f9df81c4b5 am: a4bf28fc87 am: d98df24eda am: 1afe13c03c

Change-Id: Ice6ad2d88926966884f68db656fd5f881299defe