Merge ada993eff3a8d60ea342e2534fab5ef7691337c8 on remote branch

Change-Id: I14ddc1cec9b768033248c607e498d454b6b31b4b