Bug: 18517951 (cherry picked from commit 5986ee7f) Change-Id: I432c68e840d625b63fafd03a5862ce15295be515