Merge "Disable hardware acceleration"
am: 2245d768b0

Change-Id: Icb1101cf92979332c97b3001db86aee0bcfc48af