Merge 51ebf2fdbe7c1f19fc00ecd7482c9495da9c34ab on remote branch

Change-Id: Ic5a64e0320274229ec9d05c6481017790662ea78