c2439d28e8
Also, fix warning related to catch() and cpplint error. Change-Id: I4292170538d0f700fccb605814c5058543abe74a