am 2f4bfbf5: Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well.

* commit '2f4bfbf51aa6044196f5a2e9767589aeb8324c51':
  Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well.