Test: https://paste.googleplex.com/5345498821033984 Bug: 64131637 Change-Id: I0fbd48fe8ef5e008af714312859b513a22679fcb