do not merge: cherry-picked 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch

Change-Id: I03e99bfa70ab86eb8eaa2984b6da26a92bd2718a
1 file changed