Merge "Cat rescue." into oc-mr1-dev
am: 6d6cf285ea

Change-Id: I316ee0123d12cef760177cb0853cb446cd3e91d6