Re-apply local patch dropped during 'git merge'
am: 77f300250d

Change-Id: I9283953c39054b7abaa69b41f10b4d12dfbe44bd