Change-Id: I0a95ff408f7ac4d1d59d7d839e2ebd8cd3359c8b Closes-Bug: #1665220 (cherry picked from commit 6797945d5d)
6797945d5d