Test: N/A Change-Id: Ifa4103c37960af20248d4b3ce39b2a823d227518 (cherry picked from commit 12150c59585f490398f09e8e56a0a46c500a8e05)