Merge "Fix spelling error in warning"
am: 79e0fb87eb

Change-Id: I0f4dabb3c2523bc0780cc2b5810272e19d115cbe