Merge "Add support for profiles without preopt" into oc-mr1-dev
am: 1fbc7fe671

Change-Id: I33ee084317a18181ce3b43afe9da5a7ec3876d61