Bug: Issue 9974 Change-Id: Idf415661d82ab171101b2da036c29f2cd336da87 (cherry picked from commit 294dd4ad540571a756d21ad21f09646c7a755130)