Bug: 129769339 Test: Builds. Change-Id: Icc1943d1e5aa5845533074704c0d11c0f97f3fbd
mentioned in commit 923ac21b