Merge "Fix ProGuard error."
am: 42cb024cff

* commit '42cb024cff9d5fd3231ce8c7cb3c855f34693813':
  Fix ProGuard error.