[automerger skipped] Allow deprecated declarations RESTRICT AUTOMERGE am: 5fb3126bb5 am: c938e59844 am: 1aa65f0444 -s ours am: 1494755365 -s ours am: 80dc6ecc26
am: ce7ed7b99f

Change-Id: Ia344b200abe275c22b4578e97fc2a0d8e98cde3b