Follow-up to commit acc4c402de. Change-Id: Ie519caf791b6444afdc5a8665b1fbd719f916388 Story: #2004341
acc4c402de