am 97024451: am a84d38ef: Merge commit \'2d01b8e2\' into lmp-mr1-dev * commit '97024451': Overhaul error handling in AndroidCameraAgentImpl.