Merge "Track activity launch failure." into oc-dev am: a2b21f561c
am: b23a0c8e25

Change-Id: I6a3395e467348d212cb8ae2a9b5e3b5c31ab0d83