adapt 7.1

Change-Id: I580a2c2b517e0f32a814abd940aa15b4f6c86b55