Manually copied from deleted dev branch.

Change-Id: I65855b782aeb81a20c4d86301d27cb622fdb6cc6
2 files changed