Merge 79b2158652c0c655194473295cb2b42a17d58e7f on remote branch

Change-Id: I048e0c9c1ae30632a06ecec11e238a9abe5f15d6