Bug: 18390752 (cherry picked from commit 2a63032e) Change-Id: I713930b8ad8d8a1353d289c1f9268159c3ad862d