do not merge: cherry-picked 4ffc2eb9858fbce8558a52755b4e48a928399cce from master branch

Change-Id: I03e99bfa70ab86eb8eaa2984b6da26a92bd2718a
1 file changed