Merge "Add documentation for what to use for SS changes" into pi-dev
am: 7f1944a365

Change-Id: I495b69f9312a264be4f86acbeb37138454a510cc