Merge bafc9878268b465bde91db7b4a3f5bea42e3e6b4 on remote branch

Change-Id: I237209c592eb2a7708afb8854c0dd7a06a00cad6