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

Change-Id: I20659069ae3134cca319b39e9371119466570dee