BH test 6.

Change-Id: I60d8c99743b622a168ccb5d023fe9dad4acdf368
BH test 7.

Change-Id: I4e644eb5316c9596f1118b03f32b391714b4d7b9