am 2c10ad01: am e7e528ac: Merge commit \'c15ddae4\' into lmp-mr1-dev * commit '2c10ad01': Ensure agent error handler is always non-null