Merge commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba' into eclair-mr2-plus-aosp * commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba': Avoid signaling a format change to the client if its insubstantial.
Merge commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba' into eclair-mr2-plus-aosp * commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba': Avoid signaling a format change to the client if its insubstantial.