Experimental fix. Bug: 19193521 (cherry picked from commit 65370e37) Change-Id: If59fe9a7bd16f3578ed036a5dbb2787862b33766