Closes-Bug: #1572819 Change-Id: I1f2edb482af1e85708159a0dba44a79427dc5af3 (cherry picked from commit a861450fd2)
a861450fd2