Bug: 27942453 (cherry picked from commit 0e28d355) Change-Id: I3501749820b09945ce5422d3588581a05d668ebf