Merge remote-tracking branch 'origin/fp/fp2_5.1_int'

Change-Id: I73c220acaa16db317f36fedd2e276e2f918266d2