Merge 50c1da716b091b3c3e9203f7141432801f2620b4 on remote branch

Change-Id: I9334d408986922974ffdd86051418d0f53dc6ed9