Merge dbf9feb349e072275660320c37e6f544339b2c04 on remote branch

Change-Id: I324efb27a229ba4187c0f75be2327027d7440b56