tree 6f115f412886537a9ee1b2fa536fff149c749a68
parent bf94988c3684ea27304e3e6ba72bc72fbddd4543
parent ed30c67c751f5ff7f1b4b60f2d6b4c0ae7b773df
author Qi Jiang <qijiang@google.com> 1519448076 +0000
committer android-build-merger <android-build-merger@google.com> 1519448076 +0000

Revert Monsoon change but catch more exceptions am: cd4a0a5c21 am: 44b6d67584 am: 01ec9e3800
am: ed30c67c75

Change-Id: I7e5583c8e6faffbf712846ab4d3793af6d165a55