Merge commit 'ff03c0f' into upstream_2.7.2 am: 3276dfdbb1 am: 805e08a434 Change-Id: I6379a0e20bad31f085487bc5b68230ab67446768