multi-project commit with Ia2dd81afb4ea124094a20a39e31ffd193edff3d2 Change-Id: I80fe8f2ce137fedf48038955d5f3d9deed04f763