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

Change-Id: I81c35fd42fa001afd90a28c6085f4f4fafafcf63