am 56eb96fc: am ac5a7844: am c5d5c3db: Merge "bitmapfun: Add support to use inBitmap option" into jb-mr1-dev

* commit '56eb96fcfe2adff3df95783ef3ae65fc4124252e':