Merge "Document how to handle save on multi-steps activity." into oc-mr1-dev
am: a4dffa032b

Change-Id: I01afae63e1fa5503104244c2e78dfb589697a467