Bug: 18638116 (cherry picked from commit 16abc5f2) Change-Id: I15478306b3c2e2bd4f0a1d4307c001f64c0652af