Change-Id: I66e360ed36616a79bac24aca7ea364a0ed5aabe8 Closes-Bug: #1709608 (cherry picked from commit 85c5496e1d)
85c5496e1d