Bug 1333424 Change-Id: I6ab58a154513fbe3185be91f251c5c1aa213a7a1 (cherry picked from commit 3658fa88)