Merge b837153279e88137b3244dc31f5703e1a4ae1342 on remote branch

Change-Id: I9ea7a1d950954fda165864fb415fb09f787a699f