Merge "resubmitting Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9"