Bug: 18485243 (cherry picked from commit be6fa5eb) Change-Id: I6e4d8e7587f7e03288ce039471154c1e6ebc7d8a