Bug: 144698400 Test: included Change-Id: I0f5880867ff89e36e6fddbf0d2423521837e0dff
mentioned in commit dfe8960a