Change-Id: I84f68e837a57e895b80fdaecf825e0227be67a37 Closes-bug: 1737175 (cherry picked from commit e0a6789707)
e0a6789707