0acf946bb4
cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93 Change-Id: I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93