Merge bb949e69d834c58d33a42438938ab092251167c3 on remote branch

Change-Id: Id161e9eab3f434fb5b0b63f0cd68ba59b7ad83c0