Bug: 18342629 (cherry picked from commit 7bcea103) Change-Id: I5d5c7511bbc705d040095f4934d98d326d54d39e