This was brought back by a bad merge conflict resolution in change 0efbd9a4. Change-Id: I0c7cbe8ee396293619eabf4d0a3c2f06c76bdd6e