tree c64d66babf560fc46c241f0f9c5438b1be638702
parent 5ac3592d7f026c4af9b7f6e1207db116cbaf9d7e
parent 041bdd8e102e20cc8345560f037a8b032bd132e8
author Mohamad Ayyash <mkayyash@google.com> 1466108252 -0700
committer Mohamad Ayyash <mkayyash@google.com> 1466108252 -0700

resolve merge conflicts of 041bdd8 to nyc-mr1-dev

Change-Id: I8b9b227f8afedb1eb77de8be9de689e3c621003e