ba8a3ff176
Bug: 406740276 Flag: EXEMPT bugfix Test: locally tested Change-Id: I4dfd0434e9537103144d08fa4db96f43ee5b59a8