Merge RP1A.191031.003

Change-Id: I5210cae24738268ac33f42cbb0dc4f8da80141bb
tree: fa1f2fa1241d8cbcdbb82db8b217d2c1292df5d9
  1. apex/