Merge "Allow applications to define failure handlers" into oc-mr1-dev
am: e551d361ac

Change-Id: I5c325e4bef2274d35fec3a0653043745383c77b6