Merge 3db771b8150e1f35151c9997afa70f0cc3c25ed8 on remote branch

Change-Id: Ia5cb6f1da3dad184d7f8f81fd7897f050b39c542