Not correct for Quick. Bug:21870666 This reverts commit af268bbc. Change-Id: Id44849cc877a42495619fd71bfd2db75159b6868