am 6c2fa7f2: am ca507f86: Merge "Log null returns from Camera.getParameters" into lmp-dev

* commit '6c2fa7f20c7dc4f2d425f07b39cb574291c3ed15':