Merge "Workaorund a strange proguard and VM issue before Lollipop." into nyc-mr1-dev
am: 73b7e3572d

Change-Id: I623ebfed911f420532ca22d8388ab166af126234