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

Change-Id: I24e65e05fcf46b584af80c732330623ec521870f