clean up error reporting in push parser

Change-Id: If9c37be3a86e564b568e4ee1c493bab1fafbb5a3
Merge remote-tracking branch 'koush/master' into cm-10.2