Bug:127811703 Test: None. Change-Id: Ic57db61d47616e41e447ef5573ec7c0b0c3e0ca4
mentioned in commit 3da2534c