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

Change-Id: Ibd4fea275216c109a2db03b4d9bd31b2f2ccaf2e