Bug: 36048049 Bug: 31001477 Change-Id: I69032481271b7f53c22403c3526560e6830bd9e8 (cherry picked from commit 1ca2837111c8383f9c8daf1420356998f4fb218f)
Bug: 36048049 Bug: 31001477 Change-Id: I69032481271b7f53c22403c3526560e6830bd9e8 (cherry picked from commit 1ca2837111c8383f9c8daf1420356998f4fb218f)