Merge "Fix a bug in InlinePresentationStyleUtils#bundleEquals" into rvc-dev am: bc000662 am: bc76a634 am: 913ccf14 Change-Id: I5fcf69d13358fa7c8ae228336deeb3b943b9a279