cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a

Change-Id: I8b7848139e93df385d0727f9536be73124687cc7
6 files changed