Merge 1e64e1f1223f2da2a22880c7da40a8280e7e4857 on remote branch

Change-Id: I8fbb631d06d7a1c9eaad4f806f5e5f046435bc95