Merge commit 'ff03c0f' into upstream_2.7.2 am: 3276dfdbb1 Change-Id: I26485571093bdc6eb07256dc83779eb5be5cdba5