Merge c1e24ba72c6c4abd42bef4f9293aa5ce3b644681 on remote branch

Change-Id: Ic9460371a38ebd07ad10123d427dbd25b8f024d6