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

Change-Id: I4d3a797004ff1271f307522bc04733cd5874e30a