Bug: 19694090 Change-Id: I344ad707dbd414db023e4770769b5237bd3bbb4e (cherry picked from commit 58ad7d92)