[automerger skipped] Added SSC mode 3 support am: 7f6c8d03e7 am: ce8f0170bb am: 2a20c5cee5 -s ours
am skip reason: Change-Id Ia00827f5ff1201d36439f5b2219312b3fd2f0d24 with SHA-1 a9b1d79ed0 is in history

Change-Id: I5aec7060b724c73bc04149d947a7df4fdef79ea0