In order to get closer to our code increase limit. Bug:21868508 (cherry picked from commit 432bf3d5) Change-Id: Iab19fe99a8a869b0fb841bac317016e4a3dc00e2