Bug: 129429729 Test: TH Change-Id: I33e1f953e25c50666463ef975cc705110c03b4f3
mentioned in commit 25c1bd10