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

Change-Id: I75ff776435f53c8aed5731dfe984813af48c760a