Merge b1f1ac7fa309e24e904af71203195d6a6563c1e7 on remote branch

Change-Id: I4a907af7ec7df7646b604167abbdc46a2e8f9b9c