Merge "Fix a bug in InlinePresentationStyleUtils#bundleEquals" into rvc-dev am: bc000662 am: cb95c883 Change-Id: I54bae29975b8dde9313986eae3be60ed9202e602