Merge "Clatd-related commands porting" am: 3b9ae0ae48 am: 198936ce60
am: eaa77a20e8

Change-Id: I8ee68435161734fb7abfd63b3085dae6535b6a0b