tree a690ce7983e46fbdaa6859e9eb0197487d07d54f
parent fc288ff9a825353b7c373eebfdf7180eb5cd46c7
parent cdbe1e7da1fdb541624029a4ffc768cf2db3e849
author Yi Kong <yikong@google.com> 1494362112 -0700
committer Yi Kong <yikong@google.com> 1494362112 -0700

resolve merge conflicts of cdbe1e7 to master

Test: Build
Change-Id: I3252b50b9f9ace04675cd60140b1356fbf1a2bd4