Initial commit

Bug: T1345
Change-Id: Ie101251b79b4c779d65c85e31281cf4c7a295ada