Bug: 27746233 Change-Id: I76fb0df67a75599b7fc666969624d1f8a7b6fb06 (cherry picked from commit d3299061)