Test: manual, robotests Fixes: 149070144 Fixes: 149001624 Change-Id: I422872e38f7adead81938c39b6084bbc7ed911ae