Merge branch 'drop8' into merge8

Change-Id: I88df2af9ce53bbcf0fe8bd78b64666423820d71d