Merge 893c474a5de2bfa7eccfbf9ee55f902b64258267 on remote branch

Change-Id: Ic0ad0aad851368197b82259e61da6acb6d29349d