Merge "Merge "CEC: Defer CEC actions until logical address is available" into nyc-dev am: 4853d65a60 am: 3522ec79ca" into nyc-mr1-dev-plus-aosp