Merge 50824c377b01662e8ce9d183c266623cda1a6da7 on remote branch

Change-Id: Ibef874d84aca339a3c3409f1e659f47106cca4b4