Merge changes from topic "cdex_commands" into pi-dev
am: 69f7bfe5f3  -s ours

Change-Id: Ic90b575831d21470ce7a6bf96ea60fd6153635eb