Initial commit of mock 2.0.0 am: 824c5b747c
am: b44695a467

Change-Id: If43e32402d785525742802afda8d40c3f1fc95d2