Merge af6d6a88bcb507bdb5ae749c19322077fc5beefa on remote branch

Change-Id: I0786ff9ecfbf5ae3174934f41e90cdfc7a15e139