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

Change-Id: I6c094b45dd4535b9bfc3438d8f376a3c0b320d48