Merge "Fix ttff cts test" into oc-dev am: b4c54618c6
am: a185e1a37e

Change-Id: Ife1084dff7a7ffd853e7495058c8568e86d72059