0e5c44de2a
This is part of fix to SWDEV-208805. The other part will be in the build_* script. Change-Id: I36397e3f918d08170db8bb228722a2b7389af83b