Merge "Fix potential NPE when proguard is on" into lmp-mr1-ub-dev