Merge e0b49b03902fb616ce12f7cd6d2d83000aa24066 on remote branch

Change-Id: I6b58e92f2f2c873e15dff8a9325e59e836d65c69