Bug 1540181 Change-Id: I9365d725453a86581d31937d0bb6057c81926a03 (cherry picked from commit cc075305)