am bffde0a6: (-s ours) am 334d9faa: Merge "Proguard: Only keep parcelables if they are used." into studio-1.4-dev automerge: 833246f automerge: 014287c

* commit 'bffde0a6d2a1fb2969ef85850d53be124a98d064':