Bug: 159995598 Bug: 159501682 Bug: 115619667 Change-Id: I6df037161dc36da7f8b33292529bbc37058f819c (cherry picked from commit a2127eb4)