Bug 30475753 Bug 35667752 Change-Id: I739ee7e259f041f5e133edf048b6b54cb7a770db (cherry picked from commit 8198deac)