(cherry picked from commit 8f40b41e)

bug 24503801

Change-Id: I6cf1afb3982c4da4f5e57188d3e24ac01c4bd416