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

Change-Id: If2f81d6444b44855e390abe71bb3355246107827