Specialize cherry pick
Specialize cherry pick

Change-Id: Ic9e6345361354f50792c4f2aabb900f55964e4c3
Reviewed-on: http://gerrit.aldebaran.lan:8080/13551
Tested-by: gerrit
Reviewed-by: dmerejkowsky <1e4b13000fa8777df4cefd2fd8215187e3deb062@aldebaran-robotics.com>

aldebaran/qibuild,aldebaran/qibuild,dmerejkowsky/qibuild,dmerejkowsky/qibuild,dmerejkowsky/qibuild,dmerejkowsky/qibuild,dmerejkowsky/qibuild,aldebaran/qibuild,aldebaran/qibuild