(cherry picked from commit 7c0fe5e9) Bug: 22541058 Change-Id: Id084a69ccd9835147ec71df6bb759e0f1b5e6fbf