Merge changes I1489eaf6,I8ee8f978 into nyc-dev

am: 575add3bcf

Change-Id: I10fd35297b5e662b9eb7804f3eea6fbea761ce12
This commit is contained in:
Adam Seaton 2016-09-21 17:55:19 +00:00 committed by android-build-merger
commit 8a73d65a54

Diff Content Not Available