cb22a428ac
Closes-Bug: #2012821 Change-Id: I989cedce7a9af3882b5510d3479b29150139e861 (cherry picked from commit 2783fb710710103fe6aca3ff18c976590ca15e09)