Merge 10448512785bfb08c26ba7a22e8d5912448feddd on remote branch

Change-Id: Ie316e20fd3176436750b49336a5487440fef40a2