Merge 5dc40814c466c3b2331805f170784b2368f7be96 on remote branch

Change-Id: Ieda2f2a01029475cc61a7a8b9a9ad75e2b83c9d5