Change-Id: If982d397e7c8ed8ac36f6274cbb3438cb04075b3
Closes-Bug: #2087537
(cherry picked from commit 51fb7f92)