Merge f682fbe5f8da5f9a8453653228354dc2b94db352 on remote branch

Change-Id: Ie5cd3cb9c4cc20e05ad5f0675ddb872ec026cd21