tree ea1fe5ce3b539c5d9a34f3f53b005568599bc3d5
parent c61a896f2006d76fd3d805ace2282b9590432a67
parent 9515c23e1655849496b34c6265c485fb20d5487f
author Josh Gao <jmgao@google.com> 1456344508 -0800
committer Josh Gao <jmgao@google.com> 1456344508 -0800

resolve merge conflicts of 9515c23e16 to klp-modular-dev

Change-Id: I4b39875ce57bb1ea55898db3ffc004a491bbeaa4