SDK Bug: 21115 (cherry picked from commit 94a55ddf0b) Change-Id: I7c61bd171d85a52fdb0ac21bd2861f3d474eb4dc
94a55ddf0b