This reverts commit 7f09ce1a23 (but
retains the bug fix)
Change-Id: Ib4700ada5aa0b5dab7e43f895b48eb7058308869
Fixes: 62543637
Bug: 62181033
This reverts commit 7f09ce1a23 (but
retains the bug fix)
Change-Id: Ib4700ada5aa0b5dab7e43f895b48eb7058308869
Fixes: 62543637
Bug: 62181033