(cherry picked from commit ea80942c) bug:22031382 Change-Id: If410045779adb9e7e611af22c988232b5bf9a902