Bug: 16867274 (cherry picked from commit ab61295e) Change-Id: I5466af563032041ef4a547894f40f303871302c6