Merge "Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94
am: 00e73e75d5" into nyc-mr1-dev-plus-aosp
am: 0f8347312f
* commit '0f8347312f30c08fba18c2a42834f59f5d88aee9':
Change-Id: If6f6ea84b92e909a48802894aa202b956edcf9b8
This commit is contained in: