Merge "Corrected typo in word device am: accbabf2 am: ab69521c am: 981ceac9" into nyc-mr2-dev-plus-aosp