ef60abb065
This is useful for us right now to be able to merge stable/7.0 branch into master branch. Change-Id: Iaadda86ffdf8c67ad566689f57445b704a7f83b5