Merge "camera: initialize smart pointer before usage"
am: 8f89886dad

Change-Id: If69640739b66bb2d195d40eb54d776c34f6e350b