Merge changes I7f32dc9f,I9d88ddb1

am: cd9ce19e9c

Change-Id: I3294cceacf564de140e374068c5ed3974df1875c
This commit is contained in:
Josh Gao 2016-11-11 22:30:57 +00:00 committed by android-build-merger
commit e250aff83f

Diff content is not available