Fix: 28030321 Change-Id: I7efe59b651a62ca917ba74312a80b56c0564e060 (cherry picked from commit dd383597)