Manually merge commit '1e99901' into nyc-mr1-dev-plus-aosp
am: e654f0e9a8

Change-Id: Ie4efb6153e0ddfc724e879b85a897cc5a391d6ea