Initial import Abigail am: d7d371a742

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20f89560ba5682d63b14deea520e6fca6f0fa4ef