BUG: 130237604 Change-Id: Ie021f1fd5452f36b280c0e145aab4756505af6c2 (cherry picked from commit fb0bb906320823f053c03850251224f4c3d560d0)
mentioned in commit 74d632c8