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