Merge \"Improve stub hal read and write timing\" into nyc-mr1-dev
am: 4d2023e33a

Change-Id: Ifde2c9c73e963c1513c1fd1bd82df1009963a676