50a94b8630
This solves a problem with declaring multiple Parcelable static inner classes. Change-Id: I5e42b412d6d937df19a388988be5aa58a8dbc3e4