Follow-up to commit acc4c402de42be0b1fb179d13dcf86a4ca384206. Change-Id: Ie519caf791b6444afdc5a8665b1fbd719f916388 Story: #2004341
Change-Id: I48f20f0b96931a17c477b9687b0ee963cb7b8879 Story: #2004341 Task: #29574