Merge tag 'v2.7.13' am: 181a615a16
am: e4771c1870

Change-Id: I33b8b0de7a5e12761ba3ba06072ca4d2ef26266b