08270cebab
Follow-up to commit acc4c402de42be0b1fb179d13dcf86a4ca384206. Change-Id: Ie519caf791b6444afdc5a8665b1fbd719f916388 Story: #2004341