Merge "Fix saving target fragment when Fragment not yet created." into oc-dev
am: a16859114d

Change-Id: Ia61f383eba7639a3c29fcf4a13b53177141e65d2