Merge changes from topic 'am-3e509cc2c5f147e5b2d84c53284e013e' into nyc-mr2-dev-plus...
authorXin Li <delphij@google.com>
Fri, 13 Jan 2017 00:25:53 +0000 (00:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jan 2017 00:25:53 +0000 (00:25 +0000)
am: 52ad7b0022

Change-Id: I1869c9522b4ed8229afc1e39ba4e53e7d017c227


Trivial merge