Merge commit '83aa36d' into import am: 4db398a410 am: 6a131d157f
am: 4db6738c5f

Change-Id: If66eea495e7b7282485ad7ced53fecde36995550