5d8231fa14
This is a follow-up to commit 595db83ddcbed667c6d1abdb1e697e3397df3a3b. Change-Id: Ie3d177f77289a25077592a6a0c76d65fa4ce591b Story: #2005083