Merge 5c0a0383280c9b7b831ca5ee819d234727eec872 on remote branch

Change-Id: I32de52a8629f9d1236bc421cac1b89f35be13646