Merge "Added support for flash image in both slots" into android-10.0