Change-Id: Iaf1590d7a7bec4191429a73895b9eecb65bfd367 Closes-bug: #1519218 (cherry picked from commit c168991c8f)
c168991c8f