Merge 286830306063751378d274cb85d405cc8f5d53d1 on remote branch

Change-Id: Iba77dc2d8a4dd3b9a48ee44505517ada5cd487f2