tree bff145853af015198f101a85c41a733dc0b72ea3
parent ff18e415e28a3a6b8eb5b2772c10d1b97dd1e9f9
parent 56ad8b45b7e47b7e3b5269738f55874f77ba331c
author Naveen Kalla <mrnaveen@google.com> 1478657276 -0800
committer Naveen Kalla <mrnaveen@google.com> 1478657392 -0800

resolve merge conflicts of 56ad8b4 to master

Test: Build successfully

Change-Id: Ie317dca9dccf4d9cb77c821f7c97643fd8f34a19