Merge ab232c0d858e3fc51eb68e5a2f33641ee0560881 on remote branch

Change-Id: Iaa23883bd6c060f40d5abe458c99156ff426ef99