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

Change-Id: I761f04edbcb05d935af21ce18726200b8ed4dcd3