(cherry picked from commit f0e008c6) Change-Id: Ieba1611817581b3e5f6bf2057ab6bf5b8354f769
mentioned in commit ce7bfbd7