Test: manual, Robotests Fixes: 188616179 Change-Id: I70b469ff6ef809056c9eceec7f87f91aed9a23ca
d42d9a41f6