Merge ae50c3db42028de9cb04d82160d4332d3c008f57 on remote branch

Change-Id: I1e574951500784a4b3da22cd68653a96a01c2b5f