cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5

Change-Id: Ib47cf367f5c9ca66da2921fa86078693198a7968
1 file changed