Merge changes from topic "cdex_commands" into pi-dev
am: 041b38479d  -s ours

Change-Id: Ic5a5df89536a53b68f462478d394874f691a8fe8