manual merge 0244ecf

Change-Id: I45949323053583fc1c12460061f31eea067e7fa5
2 files changed