Merge bf5cd143fcf583c327808a76edd18e7bfb8efc93 on remote branch

Change-Id: Ieb4fc0454262fd532b4e06e981ad17a14710a0d5