Change-Id: I6dd022231dd1b16a8fc1eeebe3e57f11079517aa Closes-Bug: #1587028 (cherry picked from commit 9365e35411)
9365e35411