Merge "Add documentation for what to use for SS changes"
am: 12ee7a7eec

Change-Id: Icec89d1278bd1b3cd2be8f9a2faa839d0ee1f463