am 54c5e5b1: am 1b8c01db: Merge "Product-configurable sparse ext images."

* commit '54c5e5b18be967a46fbee8769c392cbe0dfe7530':
  Product-configurable sparse ext images.