Merge "Move Camera.EventHandler constructor to greylist" am: b31032b3b0
am: 7746e7c553

Change-Id: I2d812e9a4bcb1e64b736a84da9a33e4275a4f503