Bug: 319669529 Merged-In: Ieb0f4e5bed09cbe61865808fca76232fec698517 Change-Id: I0dc9be4204899edd5a74ccdcaee2004a778e2aee
mentioned in commit 4d1eb814