Change-Id: I3248fd591a0aca95593206df09fbef3428b41499 Test: Compilation
mentioned in commit 5196b7b5
mentioned in commit ed5dbf79
mentioned in commit 87a0a967