Merge 597709d4b19a9b1eff8c3569bc450c4cbdfcf228 on remote branch

Change-Id: I08372520b2fe7a2974615c326a5af6a749e386cb