Bug: 12799017
Bug: 12799384
(cherry picked from commit af608e81d4)
Change-Id: I8d1471b16e6a6d334a3a32b789045eb171b81e03
Bug: 12799017
Bug: 12799384
(cherry picked from commit af608e81d4)
Change-Id: I8d1471b16e6a6d334a3a32b789045eb171b81e03