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