Merge b8fe2d83efe4840ce684dec6775068e9b25ba57e on remote branch

Change-Id: Ie3e64e564a1c5cd8236a37f0b408806c21edd799