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