Merge a7b6ddfdc57ced61d6dd98146a1ed57ab62342da on remote branch

Change-Id: I1d09056ab020e8aaccc55aedeb38bdfa59727c39