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

Change-Id: I4f0e5c2421a131039b65cb6eb7a1895aae719d4b