Bug: 18400529 Change-Id: I749c62c3ffff916d61a2b459959d1f5b5ccf005e (cherry picked from commit 9f38701d)